<?php
/**
 * Created by PhpStorm.
 * User: Administrator
 * Date: 2015/6/16
 * Time: 12:12
 */
namespace common\account;
class Code {
<<<<<<< .mine
    public static $user = 'jiekou-clcs-06';
    public static $password = 'Tch147369';
    /*public static $user = 'scyd365';
    public static $password = 'Txb123456';*/
||||||| .r49
    /*public static $user = 'jiekou-clcs-06';
    public static $password = 'Tch147369';*/
    public static $user = 'scyd365';
    public static $password = 'Scyd123365';
=======
    /*public static $user = 'jiekou-clcs-06';
    public static $password = 'Tch147369';*/
    public static $user = 'scyd365';
    public static $password = 'Txb123456';
>>>>>>> .r228
}